Remove EXECUTORCH_BUILD_LLAMA_JNI cmake flag #12382

jathu · 2025-07-11T00:18:28Z

Summary

I think EXECUTORCH_BUILD_LLAMA_JNI is redundant. If we are building for Android (assumed true under extension/android) and with EXECUTORCH_BUILD_EXTENSION_LLM, then it implies we want the JNI bindings!

There is a C++ def EXECUTORCH_BUILD_LLAMA_JNI that does some registration:

executorch/extension/android/jni/jni_layer.cpp

Lines 488 to 493 in 31ba959

    
           #ifdef EXECUTORCH_BUILD_LLAMA_JNI 
        
           extern void register_natives_for_llm(); 
        
           #else 
        
           // No op if we don't build LLM 
        
           void register_natives_for_llm() {} 
        
           #endif

However, we turn them on for both BUCK:

executorch/extension/android/jni/BUCK

Lines 72 to 82 in 31ba959

    
           non_fbcode_target(_kind = fb_android_cxx_library, 
        
               name = "executorch_llama_jni", 
        
               srcs = [ 
        
                   "jni_layer.cpp", 
        
                   "jni_layer_llama.cpp", 
        
                   "jni_layer_runtime.cpp", 
        
               ], 
        
               allow_jni_merging = False, 
        
               compiler_flags = ET_JNI_COMPILER_FLAGS + [ 
        
                   "-DEXECUTORCH_BUILD_LLAMA_JNI", 
        
               ],

And cmake:

executorch/extension/android/CMakeLists.txt

Lines 148 to 151 in b5f950b

    
           if(EXECUTORCH_BUILD_LLAMA_JNI) 
        
             target_sources(executorch_jni PRIVATE jni/jni_layer_llama.cpp jni/log.cpp) 
        
             list(APPEND link_libraries llama_runner llava_runner) 
        
             target_compile_definitions(executorch_jni PUBLIC EXECUTORCH_BUILD_LLAMA_JNI=1)

Test plan

CI

cc @larryliu0820 @mergennachin @cccclai @helunwencser @jackzhxng

pytorch-bot · 2025-07-11T00:18:32Z

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/12382

📄 Preview Python docs built from this PR

Note: Links to docs will display an error until the docs builds have been completed.

❌ 7 New Failures, 4 Unrelated Failures

As of commit 4ba9fbb with merge base 9f2b8cd ():

NEW FAILURES - The following jobs have failed:

pull / android / build-llm-demo / linux-job (gh)
RuntimeError: Command docker exec -t b339db25ba69824166e1a48a4c7f387a4e0cf83d663f022f5a2a27c710b2a10a /exec failed with exit code 1
pull / test-eval_llama-mmlu-linux / linux-job (gh)
RuntimeError: Command docker exec -t e3105c69aea10899ab7da095cb7e06a0494c0e27b8996068460b9c639f77d3ae /exec failed with exit code 1
trunk / test-arm-backend (test_models_ethos-u55) / linux-job (gh)
RuntimeError: Command docker exec -t 8674762124cdcbdc6b496e1145da04b31dbc459e2e5bfd4c5db1409176d3b3ae /exec failed with exit code 1
trunk / test-arm-backend (test_models_ethos-u85) / linux-job (gh)
RuntimeError: Command docker exec -t db98900056f0473f54e49683099c6577ad63ad8210a88738f645b65454a8bbac /exec failed with exit code 1
trunk / test-arm-backend (test_pytest_models_ethosu_fvp) / linux-job (gh)
RuntimeError: Command docker exec -t 667f8b95257b324422b2ec616d256b5abd63207528f115aeb03d361a4de79c29 /exec failed with exit code 1
trunk / test-arm-backend (test_run_ethosu_fvp) / linux-job (gh)
RuntimeError: Command docker exec -t b9074264bf7724718494e3d107495f8ed9b36453f257b0acea8bd524bf94f9df /exec failed with exit code 1
trunk / unittest-release / macos / macos-job (gh)
backends/xnnpack/test/ops/test_rsqrt.py::TestRsqrt::test_fp16_rsqrt

BROKEN TRUNK - The following jobs failed but were present on the merge base:

👉 Rebase onto the `viable/strict` branch to avoid these failures

pull / unittest / linux / linux-job (gh) (trunk failure)
backends/xnnpack/test/ops/test_to_copy.py::TestChannelsLastTaggedReshapePass::test_quantized_to_copy
pull / unittest-editable / linux / linux-job (gh) (trunk failure)
backends/xnnpack/test/ops/test_to_copy.py::TestChannelsLastTaggedReshapePass::test_quantized_to_copy
trunk / test-arm-backend (test_pytest_ops_ethosu_fvp) / linux-job (gh) (trunk failure)
trunk / unittest-release / linux / linux-job (gh) (trunk failure)
backends/xnnpack/test/ops/test_to_copy.py::TestChannelsLastTaggedReshapePass::test_quantized_to_copy

This comment was automatically generated by Dr. CI and updates every 15 minutes.

GregoryComer

Makes sense. Thanks for spotting and cleaning this up.

larryliu0820 · 2025-07-11T21:42:09Z

I think this is a good change. cc @kirklandsign

jathu added ciflow/android Trigger Android CI module: llm Issues related to LLM examples and apps, and to the extensions/llm/ code release notes: none Do not include this in the release notes labels Jul 11, 2025

facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Jul 11, 2025

jathu added the ciflow/trunk label Jul 11, 2025

jathu force-pushed the jathu/no-EXECUTORCH_BUILD_LLAMA_JNI branch from c44e550 to 0ad4a35 Compare July 11, 2025 00:19

jathu marked this pull request as ready for review July 11, 2025 00:22

jathu requested review from GregoryComer, kirklandsign, larryliu0820 and swolchok as code owners July 11, 2025 00:22

jathu force-pushed the jathu/no-EXECUTORCH_BUILD_LLAMA_JNI branch 3 times, most recently from 3312749 to 7be82a6 Compare July 11, 2025 18:13

GregoryComer approved these changes Jul 11, 2025

View reviewed changes

jathu force-pushed the jathu/no-EXECUTORCH_BUILD_LLAMA_JNI branch 2 times, most recently from 33f8276 to ebcf4b7 Compare July 11, 2025 19:22

jathu force-pushed the jathu/no-EXECUTORCH_BUILD_LLAMA_JNI branch 7 times, most recently from c3651af to a4dad94 Compare July 16, 2025 22:29

Remove EXECUTORCH_BUILD_LLAMA_JNI cmake flag

4ba9fbb

jathu force-pushed the jathu/no-EXECUTORCH_BUILD_LLAMA_JNI branch from a4dad94 to 4ba9fbb Compare July 18, 2025 21:01

jathu closed this Aug 5, 2025

jathu deleted the jathu/no-EXECUTORCH_BUILD_LLAMA_JNI branch August 5, 2025 21:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Remove EXECUTORCH_BUILD_LLAMA_JNI cmake flag #12382

Remove EXECUTORCH_BUILD_LLAMA_JNI cmake flag #12382

Uh oh!

jathu commented Jul 11, 2025 •

edited by pytorch-bot bot

Loading

Uh oh!

pytorch-bot bot commented Jul 11, 2025 •

edited

Loading

Uh oh!

GregoryComer left a comment

Uh oh!

larryliu0820 commented Jul 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

	#ifdef EXECUTORCH_BUILD_LLAMA_JNI
	extern void register_natives_for_llm();
	#else
	// No op if we don't build LLM
	void register_natives_for_llm() {}
	#endif

	non_fbcode_target(_kind = fb_android_cxx_library,
	name = "executorch_llama_jni",
	srcs = [
	"jni_layer.cpp",
	"jni_layer_llama.cpp",
	"jni_layer_runtime.cpp",
	],
	allow_jni_merging = False,
	compiler_flags = ET_JNI_COMPILER_FLAGS + [
	"-DEXECUTORCH_BUILD_LLAMA_JNI",
	],

	if(EXECUTORCH_BUILD_LLAMA_JNI)
	target_sources(executorch_jni PRIVATE jni/jni_layer_llama.cpp jni/log.cpp)
	list(APPEND link_libraries llama_runner llava_runner)
	target_compile_definitions(executorch_jni PUBLIC EXECUTORCH_BUILD_LLAMA_JNI=1)

Remove EXECUTORCH_BUILD_LLAMA_JNI cmake flag #12382

Remove EXECUTORCH_BUILD_LLAMA_JNI cmake flag #12382

Uh oh!

Conversation

jathu commented Jul 11, 2025 • edited by pytorch-bot bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test plan

Uh oh!

pytorch-bot bot commented Jul 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/12382

❌ 7 New Failures, 4 Unrelated Failures

Uh oh!

GregoryComer left a comment

Choose a reason for hiding this comment

Uh oh!

larryliu0820 commented Jul 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

jathu commented Jul 11, 2025 •

edited by pytorch-bot bot

Loading

pytorch-bot bot commented Jul 11, 2025 •

edited

Loading